Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP Stag] fix an issue with min height of screen when Offline Indicator is shown #30887

Merged
merged 3 commits into from
Nov 6, 2023

Conversation

sarious
Copy link
Contributor

@sarious sarious commented Nov 4, 2023

@fedirjh @luacmartins

Details

  1. I moved the minHeight style to the root View, because the child View has some paddings. (just put it in KeyboardAvoidingView because of maxWeight). Also because of that we don't need to calculate insets in useInitialWindowDimensions hook.
  2. I've got rid of shouldEnableMaxHeight and added shouldEnableKeyboardAvoidingView={false} to EditRequestAmountPage page to behave the same as MoneyRequestSelectorPage page and fix an issue when go back from currency selector

Fixed Issues

$ #17866
PROPOSAL: #17866 (comment)

Fix of the issue with offline mode:
#30840

Tests

Case with adding money request:

  1. Launch New Expensify app.
  2. Tap + > Request money.
  3. Enter amount of money
  4. Press next
  5. Go back
  6. Verify that the keyboard does not flash.

Case with editing money request:

  1. Launch New Expensify app.
  2. Tap + > Request money.
  3. Create a manual request.
  4. Open the IOU details view
  5. Tap Amount
  6. Select some currency.
  7. Go back
  8. Verify that the keyboard does not flash.
  • Verify that no errors appear in the JS console

Offline tests

Case with adding money request:

  1. Launch New Expensify app.
  2. Force "Offline" mode
  3. Tap + > Request money.
  4. Enter amount of money
  5. Press next
  6. Go back
  7. Verify offline message will not overlap with the white navigation bar (IOS native)

Case with editing money request:

  1. Launch New Expensify app.
  2. Force "Offline" mode
  3. Tap + > Request money.
  4. Create a manual request.
  5. Open the IOU details view
  6. Tap Amount
  7. Select some currency.
  8. Go back
  9. Verify offline message will not overlap with the white navigation bar (IOS native)

QA Steps

See above.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
android-native-edit-offline.mov
android-native-offline.mov
android-native-online.mov
Android: mWeb Chrome
android-chrome-edit-offline.mov
android-chrome-offline.mov
iOS: Native
ios-native-edit-offline.mov
ios_native-offline.mov
ios-native-online.mov
iOS: mWeb Safari
ios-safari-edit-offline.mov
ios-safari-offline.mov
ios-safari-online.mov
MacOS: Chrome / Safari image
MacOS: Desktop image

@sarious sarious marked this pull request as ready for review November 4, 2023 20:42
@sarious sarious requested a review from a team as a code owner November 4, 2023 20:42
@melvin-bot melvin-bot bot removed the request for review from a team November 4, 2023 20:42
Copy link

melvin-bot bot commented Nov 4, 2023

@fedirjh Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot requested a review from fedirjh November 4, 2023 20:42
@fedirjh
Copy link
Contributor

fedirjh commented Nov 6, 2023

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native Screenshot 2023-11-06 at 4 47 46 AM Screenshot 2023-11-06 at 4 48 01 AM Screenshot 2023-11-06 at 4 48 18 AM
CleanShot.2023-11-06.at.05.36.43.mp4
Android: mWeb Chrome Screenshot 2023-11-06 at 4 51 22 AM Screenshot 2023-11-06 at 4 51 48 AM Screenshot 2023-11-06 at 4 52 09 AM
CleanShot.2023-11-06.at.05.40.12.mp4
iOS: Native Screenshot 2023-11-06 at 3 41 58 AM Screenshot 2023-11-06 at 3 43 37 AM Screenshot 2023-11-06 at 3 44 01 AM
CleanShot.2023-11-06.at.05.20.04.mp4
CleanShot.2023-11-06.at.05.20.52.mp4
iOS: mWeb Safari Screenshot 2023-11-06 at 3 49 49 AM Screenshot 2023-11-06 at 3 50 00 AM Screenshot 2023-11-06 at 3 50 40 AM
CleanShot.2023-11-06.at.05.21.47.mp4
MacOS: Chrome / Safari Screenshot 2023-11-06 at 4 54 41 AM Screenshot 2023-11-06 at 4 55 00 AM Screenshot 2023-11-06 at 4 55 12 AM Screenshot 2023-11-06 at 4 58 55 AM Screenshot 2023-11-06 at 4 59 02 AM
MacOS: Desktop Screenshot 2023-11-06 at 4 57 20 AM Screenshot 2023-11-06 at 4 57 27 AM Screenshot 2023-11-06 at 4 57 33 AM Screenshot 2023-11-06 at 4 58 07 AM Screenshot 2023-11-06 at 4 58 19 AM Screenshot 2023-11-06 at 4 58 25 AM

@fedirjh
Copy link
Contributor

fedirjh commented Nov 6, 2023

@sarious Please update offline test, last step to :

  • Verify offline message will not overlap with the white navigation bar (IOS native)

and for test:

  • Verify that the keyboard does not flash.

@melvin-bot melvin-bot bot requested a review from luacmartins November 6, 2023 04:46
@fedirjh
Copy link
Contributor

fedirjh commented Nov 6, 2023

We have a failed Reassure test.

* commit 'a13b7fd97f35d42d121170270d56bce3e6ecc84e':
  Prettier wanted import order changed?
  Update import order
  Make lint happy
  fix: remove underscore
  feat: new emoji font for Windows
@sarious
Copy link
Contributor Author

sarious commented Nov 6, 2023

We have a failed Reassure test.

Oh, I see. What can I do with that? It seems the error is not related to components and files that I was changed. It seem this is an error, because of someone else commits.

@sarious
Copy link
Contributor Author

sarious commented Nov 6, 2023

Now I see that "Reassure Performance Tests" is completed with successful status.
But "Jest Unit Tests" failed, and it's not related to my code.

image

@fedirjh
Copy link
Contributor

fedirjh commented Nov 6, 2023

@sarious Can you merge main again ? maybe it was fixed on latest main

@luacmartins
Copy link
Contributor

I think merging main should fix the issue

@luacmartins luacmartins closed this Nov 6, 2023
@luacmartins luacmartins reopened this Nov 6, 2023
@luacmartins
Copy link
Contributor

Sorry, closed by accident

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM. Can you please merge main to fix the failing test?

@puneetlath
Copy link
Contributor

@sarious are you able to do this asap? This is blocking the deploy so we'd like to get this fixed.

@luacmartins
Copy link
Contributor

luacmartins commented Nov 6, 2023

I'm gonna merge this PR with failing jest tests since they are unrelated to the changes in this PR and this is blocking the deploy.

@luacmartins luacmartins merged commit bd2d15c into Expensify:main Nov 6, 2023
14 of 15 checks passed
@melvin-bot melvin-bot bot added the Emergency label Nov 6, 2023
Copy link

melvin-bot bot commented Nov 6, 2023

@luacmartins looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@luacmartins luacmartins changed the title fix an issue with min height of screen when Offline Indicator is shown [CP Stag] fix an issue with min height of screen when Offline Indicator is shown Nov 6, 2023
@luacmartins
Copy link
Contributor

See above

@OSBotify
Copy link
Contributor

OSBotify commented Nov 6, 2023

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify pushed a commit that referenced this pull request Nov 6, 2023
fix an issue with min height of screen when Offline Indicator is shown

(cherry picked from commit bd2d15c)
@OSBotify
Copy link
Contributor

OSBotify commented Nov 6, 2023

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 1.3.95-7 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

OSBotify commented Nov 6, 2023

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.95-9 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@sarious
Copy link
Contributor Author

sarious commented Nov 7, 2023

I think merging main should fix the issue

I wanted to do that at first, but each merge of main branch added new problems. Firstly, it was lint issues, because someone pushed the code without the checks, after that I've got Performance Test Issues and in the end Jets Test Errors.. And all of these errors wasn't related to my code.
So, I thought maybe you can just re-run the all steps (without merging) if this error not related to some task, but just a mystical error.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.97-7 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants